Conflict between the "dev" and "master" when merging from dev to master

1 Checkout the Target Branch:

                   git checkout master

                  

2 Pull the Latest Changes:

                  git pull origin master
                  

3 Checkout the Source Branch:

                  git checkout dev
                  

4 Merge the Target Branch into Source Branch:

                  git merge master
                  

5 Resolve Conflicts: Mark as Resolved:

                  git add <filename>
                  

6 Complete the Merge:

                  git merge --continue

                  

7 Commit the Changes:

                  git commit -m "Merge changes from master into dev"
                  

8 Push the Changes:

                  git push origin dev